-
Notifications
You must be signed in to change notification settings - Fork 582
Import Blackholio #2945
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Import Blackholio #2945
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Upgraded module to 0.12 * 0.12 upgrade is working * Fixes * Fixed some server warnings * Small fix * Apply suggestions from code review * Update Cargo.toml * Package upgraded to 0.12.0 * Renamed SampleScene => Main --------- Co-authored-by: John Detter <no-reply@boppygames.gg> Co-authored-by: Tyler Cloutier <cloutiertyler@users.noreply.github.com>
* First pass of moving C# SDK Testsuite here * Keeping scene name as Main * Don't use local reference for C# package * Update client/Assets/Scripts/GameManager.cs * Several fixes, testsuite passing * This can be merged post 1.0.0-rc1 Small fix --------- Co-authored-by: John Detter <no-reply@boppygames.gg>
* upgrade to 1.0.0-rc1 * fixed compilation errors --------- Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com> Co-authored-by: Tyler Cloutier <cloutiertyler@aol.com>
* Fix scheduled tables The API has changed upstream and requires user to specify those columns manually. * Regenerate and fix paths
The attribute no longer exist, we now either infer the name automatically or specify it within the `table(scheduled(at = ...))` attribute instead.
* Circle splitting and recombining; Client re-coloring * Renamed Entity.id into Entity.entity_id * Client refactor; Polish; Bugfixes * Store username between game runs * Renamed EntityActor.OnUpdate to OnEntityUpdate * [WIP] C# server * [WIP] C# server * Changed `DateTimeOffset` to `long` in C# module * Parallax background * Animate entities when they get consumed * Fixed respawn button * Draft into Steve's branch (#12) * Small changes * Changes to align with the tutorial. * Fixed rebase issue * Merged ConnectionManager and EntityManager into GameManager for tutorial simplicity * Renaming Actor -> Controller for simplicity's sake, although Actor is a good name * actor -> entityController * Merged ArenaController into GameManager for simplicity and cleaned up a few things * Small cleanup to keep it in line with the tutorial * Small changes to how overlapping works * Rebrand to Blackholio * Rebrand to Blackholio (missed one) * Added a README.md * fixed readme --------- Co-authored-by: Steve Gibson <steve@clockwokrlabs.io> Co-authored-by: Tyler Cloutier <cloutiertyler@users.noreply.github.com> Co-authored-by: Tyler Cloutier <cloutiertyler@aol.com>
…testing (#13) * Test with upstream subscription API + fix respawns + add suicide for testing * Add comment on not loading Auth Token for testing. * Remove dangling meta file? * Switch server-csharp to local build temporarily & fix all issues * Remove needless comment * Add comment to csproj * Remove debug logs
Merged the player and logged_out_player tables into only a player table, to match the way it is used in the tutorial documentation. Slight changes to how logged_out_player was being referenced was required due to the tables having different architecture.
* Fix C# server build process & get rid of dead link in client manifest.json * Fix unfinished paste * Update for new c# codegen * Update generated code and package jsons * Revert server-rust dependency override
…19) * Fix C# server bug with overlapping circles Update for Timestamp stuff * Update for EventContext changes (TODO: update package .jsons once c# SDK PR is merged * Regenerate * Fix package .jsons * Update for new AuthToken logic * Update for no onUnhandledReducerError + fix package jsons * Revert server-rust/Cargo.toml change
These changes match those found in the Docs side with PR clockworklabs/spacetime-docs#169
* Fix version and old property Changed version from 1.0.0-rc4 to 1.0.0 Replaced ctx.CallerIdentity to ctx.Sender * Regenerated autogen files with actual version of spacetimedb Changed package from stage to regular * Create global.json Added global.json, to prevent trying to generate code with wrong net sdk version * Updated manifest with dependency address used in quickstart guide --------- Co-authored-by: rekhoff <r.ekhoff@clockworklabs.io>
Co-authored-by: Zeke Foppa <bfops@users.noreply.github.com>
* Add instructions to README * Update README.md
…lio/master' into bfops/import-Blackholio
jdetter
approved these changes
Jul 17, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tested this but it seems reasonable. This will be tested when we migrate the CI over and this won't break anything if it's not working.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Changes
Merge the Blackholio repo commits and contents into a subdirectory of this repo, completely unchanged. The branches have already been migrated as
Blackholio/[original branch name]
.This should be merged with a merge commit, for two reasons:
master
without getting horrible merge conflicts (a squash commit would essentially newly create all of those files, causing merge conflicts)Because of that, I think we should skip the merge queue to merge this PR (so that we can use a merge commit). It's entirely new files, so it should not cause any issues for other PRs.
API and ABI breaking changes
None
Expected complexity level and risk
1
Testing
None. There's no CI associated with Blackholio.